--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 4757550626a077a0ed5e50acc25747b52d6b3d6d
Parents : 4fa3dbb
Author : Mark Qvist <mark@unsigned.io>
Date : 2022-09-30T20:44:26+02:00
Updated default config dir paths
Changes
Diff
diff --git a/nomadnet/NomadNetworkApp.py b/nomadnet/NomadNetworkApp.py
index c845c43..d791bcf 100644
--- a/nomadnet/NomadNetworkApp.py
+++ b/nomadnet/NomadNetworkApp.py
@@ -26,10 +26,12 @@ class NomadNetworkApp:
_shared_instance = None
userdir = os.path.expanduser("~")
- if os.path.isdir(userdir+"/.nomadnetwork") and os.path.isfile(userdir+"/.nomadnetwork/config"):
- configdir = userdir+"/.nomadnetwork"
- else:
+ if os.path.isdir("/etc/nomadnetwork") and os.path.isfile("/etc/nomadnetwork/config"):
+ configdir = "/etc/nomadnetwork"
+ elif os.path.isdir(userdir+"/.config/nomadnetwork") and os.path.isfile(userdir+"/.config/nomadnetwork/config"):
configdir = userdir+"/.config/nomadnetwork"
+ else:
+ configdir = userdir+"/.nomadnetwork"
START_ANNOUNCE_DELAY = 3
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────